gtk: Avoid using gdk_screen_get_setting

We can get the setting from the display instead.

diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
index be88565216bcce0324e0fa4d1317955f6a972ded..febb76df36ba5a097dc17065ea83adfcd7bd2cea 100644 (file)
--- a/gtk/gtkapplication-dbus.c
+++ b/gtk/gtkapplication-dbus.c
@@ -284,7 +284,7 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,
       GValue value = G_VALUE_INIT;
 
       g_value_init (&value, G_TYPE_STRING);
-      gdk_screen_get_setting (gdk_screen_get_default (), "gtk-session-bus-id", &value);
+      gdk_display_get_setting (gdk_display_get_default (), "gtk-session-bus-id", &value);
       id = g_value_get_string (&value);
 
       if (id && id[0])

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index e05ffd3ee8b677fb1f1f84e9473fcea6cb1e2ca7..a5dd1896952ff5504a9c11f3062629e456866bd4 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -476,7 +476,6 @@ display_opened_cb (GdkDisplayManager *display_manager,
 {
   GValue value = G_VALUE_INIT;
   GSList *slist;
-  GdkScreen *screen;
   GtkSettings *settings;
 
   for (slist = gtk_modules; slist; slist = slist->next)
@@ -489,13 +488,12 @@ display_opened_cb (GdkDisplayManager *display_manager,
            (* info->display_init_func) (display);
        }
     }
-  
+
   g_value_init (&value, G_TYPE_STRING);
-  screen = gdk_display_get_default_screen (display);
 
-  if (gdk_screen_get_setting (screen, "gtk-modules", &value))
+  if (gdk_display_get_setting (display, "gtk-modules", &value))
     {
-      settings = gtk_settings_get_for_screen (screen);
+      settings = gtk_settings_get_for_display (display);
       _gtk_modules_settings_changed (settings, g_value_get_string (&value));
       g_value_unset (&value);
     }